bitkeeper revision 1.406 (3f576d82JxYSefXXewnkohaEsNAdlg)

dev.c:
  Fix a network rx bug.

diff --git a/xen/net/dev.c b/xen/net/dev.c
index c00994e6a1f0b0fd3dbfeeebf53e6f995b0b4a06..ca35f5aa661b4939b16b71762312b45ee26c5cb2 100644 (file)
--- a/xen/net/dev.c
+++ b/xen/net/dev.c
@@ -662,9 +662,12 @@ static void net_rx_action(struct softirq_action *h)
         if ( !VIF_LOCAL(skb->dst_vif) )
             skb->dst_vif = find_vif_by_id(0);
         
-        deliver_packet(skb, skb->dst_vif);
-        put_vif(skb->dst_vif);
-        
+        if ( skb->dst_vif != NULL )
+        {
+            deliver_packet(skb, skb->dst_vif);
+            put_vif(skb->dst_vif);
+        }
+
         unmap_domain_mem(skb->head);
         kfree_skb(skb);
     }